From c8de9abe98d64295223860d2eb68090a788c73f6 Mon Sep 17 00:00:00 2001 From: Stef Walter Date: Fri, 9 Nov 2012 11:55:44 +0100 Subject: [PATCH] icon-theme: Add some preconditions for NULL arguments Related to this crash: https://bugzilla.gnome.org/show_bug.cgi?id=687967 https://bugzilla.gnome.org/show_bug.cgi?id=687977 --- gtk/gtkicontheme.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/gtk/gtkicontheme.c b/gtk/gtkicontheme.c index 764320b982..90806ee432 100644 --- a/gtk/gtkicontheme.c +++ b/gtk/gtkicontheme.c @@ -3318,6 +3318,7 @@ gtk_icon_info_load_symbolic (GtkIconInfo *icon_info, gchar *icon_uri; gboolean is_symbolic; + g_return_val_if_fail (icon_info != NULL, NULL); g_return_val_if_fail (fg != NULL, NULL); icon_uri = NULL; @@ -3398,6 +3399,9 @@ gtk_icon_info_load_symbolic_for_context (GtkIconInfo *icon_info, gchar *icon_uri; gboolean is_symbolic; + g_return_val_if_fail (icon_info != NULL, NULL); + g_return_val_if_fail (context != NULL, NULL); + icon_uri = NULL; if (icon_info->icon_file) icon_uri = g_file_get_uri (icon_info->icon_file); @@ -3485,6 +3489,9 @@ gtk_icon_info_load_symbolic_for_style (GtkIconInfo *icon_info, gchar *icon_uri; gboolean is_symbolic; + g_return_val_if_fail (icon_info != NULL, NULL); + g_return_val_if_fail (style != NULL, NULL); + icon_uri = NULL; if (icon_info->icon_file) icon_uri = g_file_get_uri (icon_info->icon_file); -- 2.30.2